Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Thu, 22 Apr 2010 12:19:18 +0000 (12:19 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Thu, 22 Apr 2010 12:19:18 +0000 (12:19 +0000)

Trivial merge